Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <[email protected]>
Wed, 1 Jul 2015 19:38:12 +0000 (15:38 -0400)
committerTom Rini <[email protected]>
Wed, 1 Jul 2015 19:38:12 +0000 (15:38 -0400)

Trivial merge